Merge branch 'no-bundled-yapps'

debian/control.top.in

@@ -29,6 +29,7 @@ Build-Depends: debhelper (>= 6),
     procps,
     psmisc,
     desktop-file-utils,
+    yapps2,
 Standards-Version: 3.9.2
 Vcs-Browser: https://github.com/LinuxCNC/linuxcnc
 Vcs-Git: git://github.com/linuxcnc/linuxcnc.git

debian/copyright

@@ -18,10 +18,6 @@ Files: src/hal/classicladder/*
 Copyright: the LinuxCNC developers
 License: LGPL-2.1+
 
-Files: src/hal/utils/yapps.py
-Copyright: 1999-2003 Amit J. Patel <amitp@cs.stanford.edu>
-License: MIT
-
 Files: src/libnml/*
 Copyright: the LinuxCNC developers
 License: LGPL-2
@@ -99,23 +95,3 @@ License: LGPL-2.1+
  .
  On Debian systems, the complete text of the GNU Lesser General Public
  License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
-
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
- NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- THE USE OR OTHER DEALINGS IN THE SOFTWARE.